11. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-14 00:01:30 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

11.1 Files compared

#LocationFileLast Modified
1Porto v3.2.3/Magento 2.x/Porto Theme/app/code/Mageplaza/AjaxLayer/view/frontend/templates/layerview.phtml2018-10-10 20:33:22 +0000
2Porto v3.2.4/Magento 2.x/Porto Theme/app/code/Mageplaza/AjaxLayer/view/frontend/templates/layerview.phtml2020-06-26 11:11:14 +0000

11.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged15124
Changed1246
Inserted22
Removed00

11.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

11.4 Active regular expressions

No regular expressions were active.

11.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Mageplaza 3  * Mageplaza
4  * 4  *
5  * NOTICE OF LICENSE 5  * NOTICE OF LICENSE
6  * 6  *
7  * This source file is subject to the Mageplaza.com license that is 7  * This source file is subject to the Mageplaza.com license that is
8  * available through the world-wide-web at this URL: 8  * available through the world-wide-web at this URL:
9  * https://www.mageplaza.com/LICENSE.txt 9  * https://www.mageplaza.com/LICENSE.txt
10  * 10  *
11  * DISCLAIMER 11  * DISCLAIMER
12  * 12  *
13  * Do not edit or add to this file if you wish to upgrade this extension to newer 13  * Do not edit or add to this file if you wish to upgrade this extension to newer
14  * version in the future. 14  * version in the future.
15  * 15  *
16  * @category    Mageplaza 16  * @category    Mageplaza
17  * @package     Mageplaza_AjaxLayer 17  * @package     Mageplaza_AjaxLayer
18  * @copyright   Copyright (c) Mageplaza (http://www.mageplaza.com/) 18  * @copyright   Copyright (c) Mageplaza (http://www.mageplaza.com/)
19  * @license     https://www.mageplaza.com/LICENSE.txt 19  * @license     https://www.mageplaza.com/LICENSE.txt
20  */ 20  */
21 ?> 21 ?>
22 <?php if ($block->canShowBlock())
: ?>
 22 <?php if ($block->canShowBlock()) : ?>
23     <?php 23     <?php
    24     $helper = $this->helper(\Mageplaza\AjaxLayer\Helper\Data::class);
24     $filters     = $block->getFilters(); 25     $filters = $block->getFilters();
25     $layerConfig = $this->helper('Mageplaza\AjaxLayer\Helper\Data')->getLayerConfiguration($filters); 26     $layerConfig = $
helper
->getLayerConfiguration($filters);
26     $filtered    = count($block->getLayer()->getState()->getFilters()); 27     $filtered = count($block->getLayer()->getState()->getFilters());
27     ?> 28     ?>
28     <div class="block filter" id="layered-filter-block" 29     <div class="block filter" id="layered-filter-block"
29          data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'> 30          data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'>
30         <div id="ln_overlay" class="ln_overlay"> 31         <div id="ln_overlay" class="ln_overlay">
31             <div class="loader"> 32             <div class="loader">
32                 <img src="<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>" alt="Loading..."> 33                 <img src="<?= /** @noEscape */ $block->getViewFileUrl('images/loader-1.gif')
 ?>" alt="Loading...">
33             </div> 34             </div>
34         </div> 35         </div>
35         <div class="block-title filter-title" data-count="<?php /*
 @escapeNotVerified */ echo $filtered; ?>">
 36         <div class="block-title filter-title" data-count="<?= /** @noEscape */ 
$filtered
 ?>">
36             <strong data-role="title"><?php /*
 @escapeNotVerified */ echo __('Shop By') ?></strong>
 37             <strong data-role="title"><?= /** @noEscape */ 
__('Shop By') ?></strong>
37         </div> 38         </div>
38         <div class="block-content filter-content"> 39         <div class="block-content filter-content">
39             <?php echo $block->getChildHtml('state') ?> 40             <?= /** @noEscape */ $block->getChildHtml('state') ?>
40             <?php if ($block->getLayer()->getState()->getFilters())
: ?>
 41             <?php if ($block->getLayer()->getState()->getFilters()) : ?>
41                 <div class="block-actions filter-actions"> 42                 <div class="block-actions filter-actions">
42                     <a href="<?php /*
 @escapeNotVerified */ echo $block->getClearUrl() ?>"
 43                     <a href="<?= /** @noEscape */ 
$block->getClearUrl() ?>" class="action clear filter-clear">
43                        class="action clear filter-clear"><span><?php /*
 @escapeNotVerified */ echo __('Clear All') ?></span></a>
 44                         
<span><?= /** @noEscape */ 
__('Clear All') ?></span>
    45                     </a>
44                 </div> 46                 </div>
45             <?php endif; ?> 47             <?php endif; ?>
46             <?php $wrapOptions = false; ?> 48             <?php $wrapOptions = false; ?>
47             <?php foreach ($filters as $key => $filter)
: ?>
 49             <?php foreach ($filters as $key => $filter) : ?>
48         <?php if ($filter->getItemsCount())
: ?>
 50                 <?php if ($filter->getItemsCount()) : ?>
49         <?php if (!$wrapOptions)
: ?>
 51                     <?php if (!$wrapOptions) : ?>
50             <strong role="heading" aria-level="2"
 52                         <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle">
51                     class="block-subtitle filter-subtitle"><?php echo __('Shopping Options') ?></strong> 53                             <?= /** @noEscape */ __('Shopping Options') ?>
    54                         </strong>
52             <div class="filter-options" id="narrow-by-list" data-role="content"> 55                         <div class="filter-options" id="narrow-by-list" data-role="content">
53                 <?php $wrapOptions = true; 56                         <?php $wrapOptions = true;
54                 endif; ?> 57                     endif; ?>
55                 <div data-role="ln_collapsible" class="filter-options-item" 58                     <div data-role="ln_collapsible" class="filter-options-item"
56                      attribute="<?php echo $filter->getRequestVar() ?>"> 59                          attribute="<?= /** @noEscape */ $filter->getRequestVar() ?>">
57                     <div data-role="ln_title" class="filter-options-title"><?php /*
 @escapeNotVerified */ echo __($filter->getName()) ?></div>
 60                         <div data-role="ln_title" class="filter-options-title"><?= /** @noEscape */ 
__($filter->getName()) ?></div>
58                     <div data-role="ln_content" class="filter-options-content"><?php /*
 @escapeNotVerified */ echo $block->getChildBlock('renderer')->setFilter($filter)->render($filter); ?></div>
 61                         <div data-role="ln_content" class="filter-options-content">
    62                             <
?= /** @noEscape */ 
$block->getChildBlock('renderer')->setFilter($filter)->render($filter); ?>
    63                         </div>
59                 </div> 64                     </div>
60                 <?php endif; ?> 65                 <?php endif; ?>
61                 <?php endforeach; ?> 66             <?php endforeach; ?>
62                 <?php if ($wrapOptions)
: ?>
 67             <?php if ($wrapOptions) : ?>
63             </div> 68                 </div>
64         <?php else
: ?>
 69             <?php else : ?>
65             <script> 70             <script>
66                 require([ 71                 require([
67                     'jquery' 72                     'jquery'
68                 ], function ($) { 73                 ], function ($) {
69                     $('#layered-filter-block').addClass('filter-no-options'); 74                     $('#layered-filter-block').addClass('filter-no-options');
70                 }); 75                 });
71             </script> 76             </script>
72             <?php endif; ?> 77             <?php endif; ?>
73  78             <?php if ($helper->ajaxEnabled()) : ?>
74             <script type="text/x-magento-init"> 79             <script type="text/x-magento-init">
75                 { 80                 {
76                      ".block-content.filter-content":{ 81                      ".block-content.filter-content":{
77                          "mpAjax": <?php echo $layerConfig ?> 82                          "mpAjax": <?= /** @noEscape */ $layerConfig ?>
78                      } 83                      }
79                 } 84                 }
80             </script> 85             </script>
    86             <?php endif; ?>
81         </div> 87         </div>
82     </div> 88     </div>
83 <?php endif; ?> 89 <?php endif; ?>